From a328b72ad9c331e55d5e79e2430a8098d44f4c0f Mon Sep 17 00:00:00 2001 From: Debian LibreOffice Maintainers Date: Mon, 10 Sep 2018 22:38:40 +0100 Subject: [PATCH] debian-hardened-buildflags-no-LO-fstack-protector-strong don't hardcode -fstack-protector-strong in configure.ac/gbuild. We get the hardening flags from dpkg-buildflags anyway. Gbp-Pq: Name debian-hardened-buildflags-no-LO-fstack-protector-strong.diff --- config_host.mk.in | 1 - configure.ac | Bin 459100 -> 458688 bytes solenv/gbuild/platform/com_GCC_defs.mk | 6 ------ 3 files changed, 7 deletions(-) diff --git a/config_host.mk.in b/config_host.mk.in index 7e6b38f11fb..9ed8f0a7ce5 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -239,7 +239,6 @@ export GTK_PRINT_LIBS=$(gb_SPACE)@GTK_PRINT_LIBS@ export USING_X11=@USING_X11@ export HAMCREST_JAR=@HAMCREST_JAR@ export HAVE_GCC_AVX=@HAVE_GCC_AVX@ -export HAVE_GCC_STACK_PROTECTOR_STRONG=@HAVE_GCC_STACK_PROTECTOR_STRONG@ export HAVE_GCC_BUILTIN_ATOMIC=@HAVE_GCC_BUILTIN_ATOMIC@ export HAVE_GCC_BUILTIN_FFS=@HAVE_GCC_BUILTIN_FFS@ export HAVE_GCC_FINLINE_LIMIT=@HAVE_GCC_FINLINE_LIMIT@ diff --git a/configure.ac b/configure.ac index 8dad70603166c0124d272b522bf28125caa18c35..d88f8ea2687c96533634a12e3008d906c423b3db 100644 GIT binary patch delta 33 mcmcc9By-@ubVCbc3)2>6YlZgfip)UF0>rG_uPd^(-Uk5dy$zHA delta 111 zcmX@`U;0jyOhXG}3)2>6YXu42wBnM){Jiw(AGw(<#c;@- n<6`oh-ekrsHocFB$r{31P{dr-ZlJ&n#4JF}y4^s5ZNhy3C%Gqz diff --git a/solenv/gbuild/platform/com_GCC_defs.mk b/solenv/gbuild/platform/com_GCC_defs.mk index 440c87df3ca..140b49971f5 100644 --- a/solenv/gbuild/platform/com_GCC_defs.mk +++ b/solenv/gbuild/platform/com_GCC_defs.mk @@ -125,12 +125,6 @@ endif gb_VISIBILITY_FLAGS_CXX := -fvisibility-inlines-hidden gb_CXXFLAGS_COMMON += $(gb_VISIBILITY_FLAGS_CXX) -ifeq ($(HAVE_GCC_STACK_PROTECTOR_STRONG),TRUE) -gb_CFLAGS_COMMON += -fstack-protector-strong -gb_CXXFLAGS_COMMON += -fstack-protector-strong -gb_LinkTarget_LDFLAGS += -fstack-protector-strong -endif - ifeq ($(ENABLE_PCH),TRUE) ifneq ($(COM_IS_CLANG),TRUE) gb_CFLAGS_COMMON += -fpch-preprocess -Winvalid-pch -- 2.30.2